Simplify arbitrary_virt_to_phys, and fix the x86/64 version to mask

out the NX bit.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h
index 61b0d4e806a53c522eeec09b960088034f128514..e8596b14ef4f709e32c6170c75352728854bb2ca 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h
@@ -438,9 +438,8 @@ void make_pages_writable(void *va, unsigned int nr);
 
 #define arbitrary_virt_to_machine(__va)                                        \
 ({                                                                     \
-       pte_t *__pte = virt_to_ptep(__va);                              \
-       maddr_t __pa = (maddr_t)pte_mfn(*__pte) << PAGE_SHIFT;          \
-       __pa | ((unsigned long)(__va) & (PAGE_SIZE-1));                 \
+       maddr_t m = (maddr_t)pte_mfn(*virt_to_ptep(__va)) << PAGE_SHIFT;\
+       m | ((unsigned long)(__va) & (PAGE_SIZE-1));                    \
 })
 
 #endif /* !__ASSEMBLY__ */

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h
index b9afd90123733b398950d2520be6e8176f237c64..d6bdf76e00573e0b1d227ed65f76a7981425f7e4 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h
@@ -29,9 +29,8 @@ extern void xen_init_pt(void);
 
 #define arbitrary_virt_to_machine(__va)                                        \
 ({                                                                     \
-       pte_t *__pte = virt_to_ptep(__va);                              \
-       unsigned long __pa = (*(unsigned long *)__pte) & PAGE_MASK;     \
-       __pa | ((unsigned long)(__va) & (PAGE_SIZE-1));                 \
+       maddr_t m = (maddr_t)pte_mfn(*virt_to_ptep(__va)) << PAGE_SHIFT;\
+       m | ((unsigned long)(__va) & (PAGE_SIZE-1));                    \
 })
 #endif